Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] create query index at the time of monitor creation #1675

Merged
merged 1 commit into from
Sep 30, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 5b27d24 from #1674.

Signed-off-by: Subhobrata Dey <[email protected]>
(cherry picked from commit 5b27d24)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@sbcd90 sbcd90 merged commit 15518fa into 2.x Sep 30, 2024
26 of 35 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 30, 2024
Signed-off-by: Subhobrata Dey <[email protected]>
(cherry picked from commit 15518fa)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.17 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.17
# Create a new branch
git switch --create backport-1675-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 15518fa53e9c2f159fd7b706cd1fc02c16a92fb4
# Push it to GitHub
git push --set-upstream origin backport-1675-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.17

Then, create a pull request where the base branch is 2.17 and the compare/head branch is backport-1675-to-2.17.

AWSHurneyt pushed a commit that referenced this pull request Oct 1, 2024
…1684)

(cherry picked from commit 15518fa)

Signed-off-by: Subhobrata Dey <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
sbcd90 pushed a commit to sbcd90/alerting that referenced this pull request Oct 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants